win32: rename initialization function for clarity

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index f9c9cecd33dc402ffa785e1361173b69395319da..86a644d156616255942d5ef58ddb5f9b40849381 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -178,7 +178,7 @@ inner_display_change_window_procedure (HWND   hwnd,
       {
         GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (_gdk_display);
 
-        _gdk_monitor_init (GDK_WIN32_SCREEN (win32_display->screen));
+        _gdk_screen_init_monitors (GDK_WIN32_SCREEN (win32_display->screen));
         _gdk_screen_init_root_window_size (GDK_WIN32_SCREEN (win32_display->screen));
         g_signal_emit_by_name (win32_display->screen, "size_changed");
 
@@ -266,7 +266,6 @@ _gdk_win32_display_open (const gchar *display_name)
 
   win32_display->screen = g_object_new (GDK_TYPE_WIN32_SCREEN, NULL);
 
-  _gdk_monitor_init (GDK_WIN32_SCREEN (win32_display->screen));
   _gdk_screen_init_root_window (GDK_WIN32_SCREEN (win32_display->screen));
   _gdk_events_init ();
   _gdk_input_init (_gdk_display);

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 8813329f297baa3a836cbfa78ddac7348fc6b5b2..eb3dc99c216142a2c6ffb95368b54f382bd0437a 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -524,9 +524,9 @@ guint32 _gdk_win32_keymap_get_decimal_mark (void);
 
 /* Initialization */
 void _gdk_win32_windowing_init (void);
+void _gdk_screen_init_monitors (GdkWin32Screen *screen);
 void _gdk_screen_init_root_window (GdkWin32Screen *screen_win32);
 void _gdk_screen_init_root_window_size (GdkWin32Screen *screen);
-void _gdk_monitor_init(GdkWin32Screen *screen);
 void _gdk_dnd_init    (void);
 void _gdk_events_init (void);
 void _gdk_input_wintab_init_check (GdkDeviceManager *device_manager);

diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c
index 3417706fa766ffa64c4997ecdc7a59c84a4a4cae..fc7673b50f15acaa4e104993d33df579a8e4119a 100644 (file)
--- a/gdk/win32/gdkscreen-win32.c
+++ b/gdk/win32/gdkscreen-win32.c
@@ -289,6 +289,8 @@ gdk_win32_screen_init (GdkWin32Screen *win32_screen)
   win32_screen->available_visual_depths[0] = win32_screen->rgba_visual->depth;
   win32_screen->available_visual_types[0] = win32_screen->rgba_visual->type;
 
+  _gdk_screen_init_monitors (win32_screen);
+
   /* On Windows 8 and later, DWM (composition) is always enabled */
   win32_screen->always_composited = g_win32_check_windows_version (6, 2, 0, G_WIN32_OS_ANY);
 }
@@ -425,7 +427,7 @@ enum_monitor (HMONITOR hmonitor,
 }
 
 void
-_gdk_monitor_init (GdkWin32Screen *screen)
+_gdk_screen_init_monitors (GdkWin32Screen *screen)
 {
   gint count;
   EnumMonitorData data;